shortcuts: Redo the stack switcher theming

Use style classes on the button instead of the stack switcher,
this makes it easier to reuse elsewhere.

diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c
index 538ddae516a0078985b2d25cb4c5b8d7b406587f..9d8de020de8a65c96cd11234ff20331001930f85 100644 (file)
--- a/gtk/gtkshortcutssection.c
+++ b/gtk/gtkshortcutssection.c
@@ -354,7 +354,7 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self)
                                  "spacing", 12,
                                  "no-show-all", TRUE,
                                  NULL);
-  gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (self->switcher)), "round");
+
   gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (self->switcher)), GTK_STYLE_CLASS_LINKED);
 
   self->show_all = gtk_button_new_with_mnemonic (_("_Show All"));
@@ -501,6 +501,7 @@ adjust_page_buttons (GtkWidget *widget,
    *       much font size specific.
    */
   gtk_widget_set_size_request (widget, 34, 34);
+  gtk_style_context_add_class (gtk_widget_get_style_context (widget), "circular");
 
   label = gtk_bin_get_child (GTK_BIN (widget));
   gtk_label_set_use_underline (GTK_LABEL (label), TRUE);

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 45916e67eb599d3a20175c1e65ddd12bb7a93dd6..edd303e6867bb38dc226aeb90bd46fdb966eb2c8 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3438,12 +3438,12 @@ decoration {
   }
 }
 
-shortcutswindow .round .button {
+.button.circular {
   border-radius: 20px;
   outline-radius: 20px;
 }
 
-shortcutswindow .round .button label {
+.button.circular label {
   padding: 0;
 }
 

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 89e913daae8c2721e71117d4815df03859b96096..5a7e15d21ff50487f7c0bb73f0050813016165cf 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4649,15 +4649,13 @@ decoration {
   background-origin: content-box;
   background-position: right center; }
 
-shortcutswindow .round .button, shortcutswindow .round .header-bar .button.titlebutton, .header-bar shortcutswindow .round .button.titlebutton,
-shortcutswindow .round .titlebar .button.titlebutton,
-.titlebar shortcutswindow .round .button.titlebutton {
+.button.circular, .header-bar .circular.button.titlebutton,
+.titlebar .circular.button.titlebutton {
   border-radius: 20px;
   outline-radius: 20px; }
 
-shortcutswindow .round .button label, shortcutswindow .round .header-bar .button.titlebutton label, .header-bar shortcutswindow .round .button.titlebutton label,
-shortcutswindow .round .titlebar .button.titlebutton label,
-.titlebar shortcutswindow .round .button.titlebutton label {
+.button.circular label, .header-bar .circular.button.titlebutton label,
+.titlebar .circular.button.titlebutton label {
   padding: 0; }
 
 .frame.keycap {

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index c47800718faca6d3047adec1f6544b7433c3f672..154015391b384940595c17cc9c7916bab2e33188 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4822,15 +4822,13 @@ decoration {
   background-origin: content-box;
   background-position: right center; }
 
-shortcutswindow .round .button, shortcutswindow .round .header-bar .button.titlebutton, .header-bar shortcutswindow .round .button.titlebutton,
-shortcutswindow .round .titlebar .button.titlebutton,
-.titlebar shortcutswindow .round .button.titlebutton {
+.button.circular, .header-bar .circular.button.titlebutton,
+.titlebar .circular.button.titlebutton {
   border-radius: 20px;
   outline-radius: 20px; }
 
-shortcutswindow .round .button label, shortcutswindow .round .header-bar .button.titlebutton label, .header-bar shortcutswindow .round .button.titlebutton label,
-shortcutswindow .round .titlebar .button.titlebutton label,
-.titlebar shortcutswindow .round .button.titlebutton label {
+.button.circular label, .header-bar .circular.button.titlebutton label,
+.titlebar .circular.button.titlebutton label {
   padding: 0; }
 
 .frame.keycap {